From 0e0e0d7609370d0a5de293b3d12eed204ca7073e Mon Sep 17 00:00:00 2001
From: robertl <robertl>
Date: Sun, 25 Feb 2007 23:24:08 +0000
Subject: [PATCH] Conifgure.in: Makefile.in gbversion.h: Bump version numbers
 gpx.c: Allow groundspeak namespace in GPX 1.1 or 1.0 format.

---
 Makefile.in  |  4 ++--
 configure    |  2 +-
 configure.in |  2 +-
 gbversion.h  |  2 +-
 gpx.c        | 36 ++++++++++++++++++++++--------------
 5 files changed, 27 insertions(+), 19 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index 5cb47933b..e8ef2d3d7 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -9,8 +9,8 @@ RELEASE=@PACKAGE_RELEASE@
 VERSIOND=$(VERSD)$(RELEASE)
 VERSIONU=$(VERSU)$(RELEASE)
 
-DOCVERSION=development
-# DOCVERSION=@PACKAGE_VERSION@
+DOCVERSION=@PACKAGE_VERSION@
+# DOCVERSION=development
 
 CC=@CC@
 EXEEXT=@EXEEXT@
diff --git a/configure b/configure
index 3fe6c319c..3e9773f05 100755
--- a/configure
+++ b/configure
@@ -1281,7 +1281,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 # YYYYMMDD, please, if beta, i.e. "-beta20060413"
-PACKAGE_RELEASE="-beta20061125"
+# PACKAGE_RELEASE="-beta20061125"
 
 cat >>confdefs.h <<_ACEOF
 #define PACKAGE_RELEASE "$PACKAGE_RELEASE"
diff --git a/configure.in b/configure.in
index 64fedc0f5..39ce49bff 100644
--- a/configure.in
+++ b/configure.in
@@ -6,7 +6,7 @@ AC_PREREQ(2.59)
 AC_INIT(GPSBabel, 1.3.3, BUG-REPORT-ADDRESS)
 
 # YYYYMMDD, please, if beta, i.e. "-beta20060413"
-PACKAGE_RELEASE="-beta20061125"
+# PACKAGE_RELEASE="-beta20061125"
 AC_DEFINE_UNQUOTED(PACKAGE_RELEASE, "$PACKAGE_RELEASE", [Define to the release name of this package.])
 AC_SUBST(PACKAGE_RELEASE)
 
diff --git a/gbversion.h b/gbversion.h
index e7f12b5e4..76e859083 100644
--- a/gbversion.h
+++ b/gbversion.h
@@ -4,5 +4,5 @@
  *
  * Isn't simplification via automation grand?
  */
-#define VERSION "1.3.3-beta20061125"
+#define VERSION "1.3.3"
 
diff --git a/gpx.c b/gpx.c
index 98be9d93f..b204f5f5a 100644
--- a/gpx.c
+++ b/gpx.c
@@ -277,20 +277,28 @@ tag_mapping tag_path_map[] = {
 	{ tt_wpt_link_text, 0, "/gpx/wpt/link/text", 0UL },		/* GPX 1.1 */
 	{ tt_wpt_sym, 0, "/gpx/wpt/sym", 0UL },
 	{ tt_wpt_type, 1, "/gpx/wpt/type", 0UL },
-	
-	{ tt_cache, 1, "/gpx/wpt/groundspeak:cache", 0UL },
-	{ tt_cache_name, 1, "/gpx/wpt/groundspeak:cache/groundspeak:name", 0UL },
-	{ tt_cache_container, 1, "/gpx/wpt/groundspeak:cache/groundspeak:container", 0UL },
-	{ tt_cache_type, 1, "/gpx/wpt/groundspeak:cache/groundspeak:type", 0UL },
-	{ tt_cache_difficulty, 1, "/gpx/wpt/groundspeak:cache/groundspeak:difficulty", 0UL },
-	{ tt_cache_terrain, 1, "/gpx/wpt/groundspeak:cache/groundspeak:terrain", 0UL },
-	{ tt_cache_hint, 1, "/gpx/wpt/groundspeak:cache/groundspeak:encoded_hints", 0UL },
-	{ tt_cache_desc_short, 1, "/gpx/wpt/groundspeak:cache/groundspeak:short_description", 0UL },
-	{ tt_cache_desc_long, 1, "/gpx/wpt/groundspeak:cache/groundspeak:long_description", 0UL },
-	{ tt_cache_log_wpt, 1, "/gpx/wpt/groundspeak:cache/groundspeak:logs/groundspeak:log/groundspeak:log_wpt", 0UL },
-	{ tt_cache_log_type, 1, "/gpx/wpt/groundspeak:cache/groundspeak:logs/groundspeak:log/groundspeak:type", 0UL },
-	{ tt_cache_log_date, 1, "/gpx/wpt/groundspeak:cache/groundspeak:logs/groundspeak:log/groundspeak:date", 0UL },
-	{ tt_cache_placer, 1, "/gpx/wpt/groundspeak:cache/groundspeak:owner", 0UL },
+
+	/* Double up the GPX 1.0 and GPX 1.1 styles */
+#define GEOTAG(type,name) \
+  {type, 1, "/gpx/wpt/groundspeak:cache/groundspeak:" name, 0UL }, \
+  {type, 1, "/gpx/wpt/extensions/cache/" name, 0UL }
+
+	GEOTAG( tt_cache, 		"cache"),
+	GEOTAG( tt_cache_name, 		"name"),
+	GEOTAG( tt_cache_container, 	"container"),
+	GEOTAG( tt_cache_type, 		"type"),
+	GEOTAG( tt_cache_difficulty, 	"difficulty"),
+	GEOTAG( tt_cache_terrain, 	"terrain"),
+	GEOTAG( tt_cache_hint, 		"encoded_hints"),
+	GEOTAG( tt_cache_desc_short, 	"short_description"),
+	GEOTAG( tt_cache_desc_long, 	"long_description"),
+	GEOTAG( tt_cache_placer, 	"owner"),
+	{ tt_cache_log_wpt, 1, "/gpx/wpt/groundspeak:cache/groundspeak:logs/groundspeak:log/groundspeak:log_wpt"},
+	{ tt_cache_log_wpt, 1, "/gpx/wpt/extensions/cache/logs/log/log_wpt"},
+	{ tt_cache_log_type, 1, "/gpx/wpt/groundspeak:cache/groundspeak:logs/groundspeak:log/groundspeak:type"},
+	{ tt_cache_log_type, 1, "/gpx/wpt/extensions/cache/logs/log/type"},
+	{ tt_cache_log_date, 1, "/gpx/wpt/groundspeak:cache/groundspeak:logs/groundspeak:log/groundspeak:date"},
+	{ tt_cache_log_date, 1, "/gpx/wpt/extensions/cache/logs/log/date"},
 	
 	{ tt_garmin_extension, 0, "/gpx/wpt/extensions", 0UL },
 	{ tt_garmin_waypt_extension, 0, "/gpx/wpt/extensions/gpxx:WaypointExtension", 0UL },
-- 
2.30.2